Bug corrections and feature updates