Denis' changes - He fucked up a commit, adding everything in /serve, so I'm rebasing and adding his changes.