more tweaks, started debugging location