few fixes, follow the guide