Improve Save stub & misc