Bug fixes and feature updates