fix paths
designer code
typo
cleanup