Now we can step through desired functions
Minor fixes