Added finish to activities, other small changes