Implemented remaining issues. Relates to #93.