Added some loging + updated options