fix pep8
fix pep8
fix pep8
delete unused tags
add default sources
more more changes on sources and bugs