Fixed a couple bugs, continue testing