fixes, advanced stuff