Fixes and visual add-ons