cleanup and fixes...