fixed bugs from staging: