fixed bugs. pushed to staging