Last fixes. Ready to start testing if everything works or not