CISCONAED-1 - fixed a few bugs