Various Bug Fixes & Security Improvements