small bugs and consistency