Added trailer read + some fixes