updated, edited, squished bugs