Fixes update

Apologies for the delay on releasing fixes, but my schedule has been completely full as of late.

This version contains fixes included in the commit description.