hopefully final commit after finishing touches