Tweaks and added data fixtures