Bug fixes with annotation generation
Add wikiscout server