fixed bugs second up