Lots of work made on various features.
Files I forgot to include in the previous revision