bug fixes, cleanup

Signed-off-by: Daniel A. Zorin <juan@lvk.cs.msu.su>