Fixed small bugs & new type provided