fix some formatting
shift few things around
add some more coverage, add lazy model
add some more coverage, add lazy model