Updated with bug fixes done before split and forgot to commit.