Closed #139
Closed #142
Working on #143