some fixes and stuff
Merge branch 'master' of github.com:radsectors/emailzilla
more random udpates