Now with more awesomeness
Small fixes