added scale tests, removed TODOs
minor update
merged stuff