-minor fixes not really working yet