Added do/while, enum Shapetype, error messages etc