LOTS of improvements and bug fixes -still looks crapy