minor additions/debuggin