Bug fixing (WIP)

Properly annotated some modules, added missing elements