fixing errors and adding atom work that's broken