re #24 symlink capabilities for puke. Clean up and bugs removal