more refactoring
fixed data saves