fixed last known bugs