Fixed saving

Fixed file saving and added some goodies.