More errors solved, not everything works yet