Rework/squirrel

Fixes for issue #9