Cleaned up extraction code. Fixed the windows make batch file.