finished up

should've commited one more time before this...