More tweaks and readme update