Added dimension/aspect ratio, activation/deactivation and added lots of returns for constraint methods/functions