Fix perms, refreshing, cleanup