fixed a little bit of this shit