tabs to spaces
more whitespace
add oval support