Fixed 4.1 compatibility issues
Started adding user roles (not good so far)
Minor fixes