Style fixes, updated readme, etc

DO NOT MERGE THIS. Use it as a place to discuss changes.