mainly comments, some light code tweaking before turning it in.