some final fixes ... working version?