more changes
added more geometry types