Updates and bug fixes
updated readme