More awesomeness and updates