updating after working out a few bugs