Issues #154 #155

* Also some CS fixes