Add modal examples, some bugfixes