minor update..meh..still not totally complete