Fixed some stuff, removed props file because I can't get it to work in other dirs