updated a bunch of stuff... first commit