Some small fixes, next commit we will have controller ready.