Cleaning up code, adding last minute comments.