3 small bugs fixed