added a bunch of more goodies