started testing, many fixes