Completed core classes class diagram
sorted some things