changed data extraction behavior, general cleanup