buncha style and functionality updates