Fixed a few problems that have arisen.
Tried fixing up some stuff