cleanup minor fixees