-locking added to soma
-various soma fixes, wip