cleanup; improved comments; fixed bug;