Added hints, lots of tweaks