minor changes, got rid of a few floating constants