about style + some bug fixes