little tweaks here and there; ready for debugging