added a buncha stuff