Some fixes and upgrades on main interface, a bit of code commentign