fixed some minor stuff, might need some additional work.