Couple of tweaks and bug fixes
Updated read me