remove colloquialism
fix bugs