Minor bug fixing going on