mutliple fixes.. oh bad commit