Several fixes and adjustments, also cheesed off about old-styl html tables in comments...