switch sites ability, some cleanup