Fix & refactor several small bugs(see issues)