This improves the issues discovered in #18 (closed). The following patch is primarily checked with monster jobhunt.