Add some mockup tags
Fix many bugs