Some fixes, some fancy sht right there