final fixes all working now