Added new schemas, comments, structure, fixed many minor things