Changed some constructors, other minor changes