backported some dev changes and removed windows support