Fixed some issues with management and organizaiton