* Checked minor details and added some exceptions (incl. ToDo's)