Final "polish", bug fixes