Fixed some bugs. Running some live testing