some cleanup, bug fixes, updated shared components