bugfix (requred 2 clicks to activate goal manager) and cleanup/redundancy elimination