Bugs fixed and interfaces changed