added the last scene and fixed bugs

Signed-off-by: Jesse Gerroir <jessegerroir@gmail.com>