student belts and belts database changes and code cleanup
small changes
Fixed conflicts