Added system settings & minor changes

Minor changes:
* Repaired import
* Check mail sending
* Removed comments and tests