Add Titan library dependecy and fix minor issues