Changed the order of some properties; Cleaned todo from comments