fixed some forgotten annoying bugs