fixed more, added more models