Fixed a lot of bugs, begining to look like a product