clean up / various changes