bugs fixed from previous version