More improvements
End of SE Hack Day

Goodnight!