fixed some warnings, improved code and added some tags for dev