weight based shipping update (#102) + more fixes