some tweaks
resolved conflicts with jason