House keeping

General clean up + addition options logging