Bug fixes

Bug fixes for:
http://tasks.eternityincurakai.com/projects/39#210
http://tasks.eternityincurakai.com/projects/39#211
http://tasks.eternityincurakai.com/projects/39#212
http://tasks.eternityincurakai.com/projects/39#213
http://tasks.eternityincurakai.com/projects/39#214
http://tasks.eternityincurakai.com/projects/39#215 and
http://tasks.eternityincurakai.com/projects/39#216