fixing a little bug here and there