Adde beetle psx and update some stuff to work with the buildbot