Added comments, changed names and moved around things
merge fix