finished and submitted

still some weird bugs