updated & squished bugs