Even more fixes and some rule-changes to prevent user stupidity...
Once I iron out the last few bugs, this is ready to be  merged...