Added some error printing functionality
changes to pythoncode
merging conflicts
finishing merge