various updates, a lot of awesomeness inside