Some cleaning up done, basically the site just works!