Security Bugfixes and improvements. Minor Bugfixes.