backup 26/06/14

Some minor bug fixes/ Still some issues.