Nested subroutines, bugfix for multiline comments, other goodies