removed version numbers, updated popmake