small cleanup and more changes in context to make it more model accure
ignore velocity.log