Added some debug code, updated todo
Beefed up constructors