Fixed tapoo and bugs