Some quickie crud bugfixes to make things work even crudely
Further crud bugfixes