Added missing functionality and touch ups