Add more specs; fix saving modifications