Bug fixes and more...