Fixed multiple bugs. See email (@10.11.14: 11:06) for further info.