added a bunch of awesomeness