Updates

Some code needed to be updated (always test before you publish kids!)