minor tweaks and push commented code