Cleaned up, added notes