A few bug fixes and updates from the last meeting