Final work for the evening. Cleaned up comments mostly.