Some small improvements

Still working on this shit