Fixes, and awesomeness!