Cleanups and update/improvements from rekkanoryo

2005-11-18, Daniel Atallah