Alex on fire -> tons of fixes