Fixed some bugs and finished first cut at last activity