Cleaned up final versions for handin