More bug fixes and small update.