Rectangle and Circle improvements