irnoted out some tweaks, submitted v03