Fixed bugs, new Travis tests