Fixed some stuff, at working stage