Added several features

Added the loginDecorator although, not used. Fixed several issues i
noticed