On-the-fly changes. Some little fixes here an there