more nigglig changes made