Fixes & new license