Fixed some major long time bugs!