changed the file endings and fixed the bool to bitvector bug
merge two branches