More features & bugs updates