fixed some parsing faults and added parsing functions for different sites