Cleaned everything, added drawings