Fix storage file
fix sonnar connect
cleanup sourcecode