Small fitting fixes and add error component