Bug fixes and tagall