Fixed small bugs and polished everything together. too many small changes to list