Added more setters and a reset method to shapes