Master updates

Cleaned it up and it should be good now.