added debugEnergy flag
updated todos
updated todos
removed unnecessary TODO
removed unused trigger
updated attach/detach icons