Issue#503 q&d

resolves #503

#463
#446