some updates; rm hardcode