automake outputs new cruft!
removed workaround which was causing problems
fixed unused variable warnings
getting the damn thing to build