Started fixing errors

Start fix a few things that