fixed functionality & squished bugs