added alot of stuff saving...