Several Fixes, cleaned up code & new transitioning effect