Added comments
Added AdminApi + some bugfixes