Changes made after some testing damm bugs