bug fixes + finishing the activity. Needs some testing and will be finished