Updates

Changed a few methods  and added more