Fixed parameters and debugged windows version, coming in next push