some tweaks as is... excuse some of the comments