a lot of updates, new styles, moving python and post processing scripts
resolving silly conflict