Commenting, fixing some project dependencies