Minior improvements
Whats going on?