vague fixes and file moves