Few fixes, add lib, add step 2