Pushing newest code (still minor bugs to be solved)