add something and fix bugs