Tweaks to rb file