fixed bugs. pushed to staging
pull from master