modifying minor bugs