cleaned up various activities, still working on animation