removed warning
refactoring
cleanup api
refactored method names, cleanup
fixed get all resources