Fixing numerous silly issues