Fixes and some close-to-finishing touches