bug fixes, added share, moved stuff around