Elusion functionality

Further functionality changes and bug fixes