Testing and bug fixing

Coming soon