fixed buncha stuff