FOUND bug.
minor fixes