Lots of pillande
Cleaned up som debug and changed the behaviour when bos thinks too long
Merge branch 'grublas-pill' into develop