More work on bugs, etc