add models & controllers + fixes