made some codefixes. currently unstable units.