mag commit
cleared warnings + other fixes