fixes to whale factory and objects