Added some basic trace functionality
Added more trace calls