minor changes & bugs