Fixed some problems. Added annotations