private/public switch working
added todo comments
some more fixes