slight updates.. still more to do.