more updates... almost done