Minor fixes / bin&lib should be done