fixed/added many things... detailed on github issues