complete Management
and bugs fixed