Cleaned up data fudger & added support for changing types