Cleanup

All of these delicious updates should definitely be merged into my main branch, because it's perfect.