Final Release bugs fixed