last minutes bugs.. grrr
final final