Resolving issues #1 and #2

@gonfunko 

Fixed issues 1 and 2, as well as adding in a much needed "mark" feature

~requested 320

#1
#2