- correct few minor bugs