Added support for SxxEPxx, fixed small bugs