Bug fixes and more!