Minor bug fixes, name improvements