fixed silly stuff