some naming convensions and added stuff to config.py
minor fixes
almost final