Readme updated, bugs fixed