Updates and bug fixing