27 feb feature
fix some bugs and limit sites for now