Some little bugs have been fixed