code cleanups
more fixes for constructors