removed hiccup support, bux fixes, updated site template