fixing bugs
Merge branch 'buildon' into deploy