final fixes and pops and follows