Minor Bugfixes, potential update content commented out for safety reasons
