Changed A lot

Fixes #4, Fixes #3, Fixes #8