RELOAD-273, RELOAD-274, RELOAD 275

Fixing bugs, code cleanup and tweaks