Small fixes and adds some buses