fixed bugs, removed unused code
updated readme