Bug fixes and visual improvements