Fixed some bugs

- The Shift + Enter issue is actually now finished.. I found the
solution (which is to select the second BR tag and create two BR tags).
- Minor bug fixes