fix destroy and add ready?, other little cleanups