more features
Successfully merged lOL branch with the new 'features'