class update and new hours
cleanup
final tweaks