fixed bugs..