fixes and work content