Code tweaks + README