bug fixes and more awesomeness