SMP + some fixes