some fixes, and a bit more baby steps.