performance boost, fixes