updated frame, cleanup

build is now in useable state