Fixed some things purely for my own convenience