Soraka + some fixes