first set of updates per fugu13 comments