Fixed some warnings, added some categories