Added profiling timers
Readded debug messages
Added other return points