cleaning up paths etc, making sure breakpoints work...