A few ammendments
Tweaks to data layer