minor changes and updates to all classes