more shapes added, fixed camera