Improvements

Please check’em out and let me know how do you feel about it.