Updated
Some fixes and tweaks