cleanup, fixes