fixes after code review
add elastica exception
minor changes