added a buncha stuffs