Fixes #142
Fixes #144
Fixes #139
Closes #136
Bersih-bersih
Resolve banyak issue (closes #143 too)