Final fixes - working now