cleanup, fixes...