final version

cleaned it up a bunch, made it noice