Various

Griefedrequested to merge
develop into beta

Various improvements, fixes, changes

Edited by Griefed

Merge request reports

Me haz all ze repositoriiiiiiiiiiiiiiiiiies