Fixing folders case and other minor stuff