Bug Fixes

Bug fixes for
http://tasks.eternityincurakai.com/projects/39#226
http://tasks.eternityincurakai.com/projects/39#225
http://tasks.eternityincurakai.com/projects/39#224
http://tasks.eternityincurakai.com/projects/39#223
http://tasks.eternityincurakai.com/projects/39#222 and
http://tasks.eternityincurakai.com/projects/39#221