FMI: some extra bugs smashed, tested and it works