added sec 1.1, cleanup in basics