small bugs and beautification