Added tiny features & bug fixing