comment tweak
tweaks and new model classes