fixed some bug prior to the latest push