added original data
more symplified geoms
small template fix
first controller test