Bug fixes and some changes, etc.