Fix bugs

Next commit: Fix Bug in empty and labeled statement