small fixes plus, speeding up travic CI