Many exceptions added and positioning repaired