some fixes

please look at these fixes as it may help to bring the project back to life