some fixes and a couple more tasks